Revert "Merge remote-tracking branch 'aosp/upstream-main' into master" Revert submission 2563157-armn_nn_update_278832962 Reason for revert: The change breaks aosp_x86-eng compilation. Test: local build This reverts commit fca03aab4b27f5d21849fdc2e7ef3393d9f1afd9, reversing changes made to 5e63e0232fe7426f10e5982bd4005d706f1beea2. Change-Id: I68ba7d2fb9c58cb42b9fb2df98ac300daccab3e6
diff --git a/docs/Doxyfile b/docs/Doxyfile index 7b025a1..323ed21 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile
@@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 23.02.1 +PROJECT_NUMBER = 20.11 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -364,7 +364,7 @@ # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions # are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Manual pages) or section (for LaTeX +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX # and RTF). # # Note that this feature does not work in combination with @@ -378,7 +378,7 @@ # the documentation of the scope in which they are defined (i.e. file, # namespace, or group documentation), provided this scope is documented. If set # to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Manual pages) or section (for LaTeX and RTF). +# Man pages) or section (for LaTeX and RTF). # The default value is: NO. INLINE_SIMPLE_STRUCTS = NO @@ -687,7 +687,7 @@ # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # tag is left empty. -LAYOUT_FILE = ./docs/DoxygenLayout.xml +LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib @@ -768,19 +768,14 @@ # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = ./docs/user_guide/introduction.dox \ - ./docs/user_guide/how_to_build_and_run_examples.dox \ - ./docs/user_guide/library.dox \ - ./docs/user_guide/data_type.dox \ - ./docs/user_guide/data_layout.dox \ - ./docs/user_guide/operator_list.dox \ - ./docs/user_guide/tests.dox \ - ./docs/user_guide/advanced.dox \ - ./docs/user_guide/release_version_and_change_log.dox \ - ./docs/user_guide/errata.dox \ - ./docs/contributor_guide/contribution_guidelines.dox \ - ./docs/contributor_guide/adding_operator.dox \ - ./docs/contributor_guide/implementation_topics.dox \ +INPUT = ./docs/00_introduction.dox \ + ./docs/01_library.dox \ + ./docs/02_tests.dox \ + ./docs/03_scripts.dox \ + ./docs/04_adding_operator.dox \ + ./docs/05_contribution_guidelines.dox \ + ./docs/06_functions_list.dox \ + ./docs/07_errata.dox \ ./docs/ComputeLibrary.dir \ ./arm_compute/ \ ./src/ \ @@ -874,9 +869,9 @@ ./src/core/NEON/kernels/convolution/ \ ./src/core/NEON/kernels/NELKTrackerKernel.cpp \ ./src/core/NEON/kernels/NEL2NormalizeLayerKernel.cpp \ + ./src/core/GLES_COMPUTE/cs_shaders/ \ ./tests/datasets/ \ ./tests/benchmark/fixtures/ \ - ./tests/validation/CL/UNIT/dynamic_fusion/ClCompositeKernel.cpp \ ./tests/validation/fixtures/ # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or @@ -1087,7 +1082,7 @@ # specified with INPUT and INCLUDE_PATH. # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. -CLANG_OPTIONS = -std=c++14 +CLANG_OPTIONS = -std=c++11 #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index @@ -1551,11 +1546,11 @@ # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from https://www.mathjax.org before deployment. -# The default value is: https://cdn.mathjax.org/mathjax/latest. +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_RELPATH = https://cdn.mathjax.org/mathjax/latest +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example @@ -1883,16 +1878,16 @@ #RTF_SOURCE_CODE = NO #--------------------------------------------------------------------------- -# Configuration options related to the manual page output +# Configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES, doxygen will generate manual pages for +# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for # classes and files. # The default value is: NO. GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the manual pages will be put. If a +# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of # it. A directory man3 will be created inside the directory specified by # MAN_OUTPUT. @@ -1902,7 +1897,7 @@ MAN_OUTPUT = man # The MAN_EXTENSION tag determines the extension that is added to the generated -# manual pages. In case the manual section does not start with a number, the number +# man pages. In case the manual section does not start with a number, the number # 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is # optional. # The default value is: .3. @@ -1911,15 +1906,15 @@ MAN_EXTENSION = .3 # The MAN_SUBDIR tag determines the name of the directory created within -# MAN_OUTPUT in which the manual pages are placed. If defaults to man followed by +# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by # MAN_EXTENSION with the initial . removed. # This tag requires that the tag GENERATE_MAN is set to YES. #MAN_SUBDIR = # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it -# will generate one additional manual file for each entity documented in the real -# manual page(s). These additional files only source the real manual page, but without +# will generate one additional man file for each entity documented in the real +# man page(s). These additional files only source the real man page, but without # them the man command would be unable to find the correct page. # The default value is: NO. # This tag requires that the tag GENERATE_MAN is set to YES. @@ -2069,7 +2064,7 @@ # preprocessor. # This tag requires that the tag SEARCH_INCLUDES is set to YES. -INCLUDE_PATH = ./src/core/CL/cl_kernels/ +INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the
